<?php
namespace app\index\controller;

<<<<<<< HEAD
class Blog
{
    public function index($id)
    {
        return '查看ID=' . $id . '的内容';
=======
use think\Controller;

class Blog extends Controller
{
    public function index($id)
    {
        return 'id为' . $id . '的内容';

>>>>>>> div
    }

    public function read($name)
    {
<<<<<<< HEAD
        return '读取name为' . $name . '的内容';
    }

    public function article($year,$month)
    {
        return '查看' . $year . '年' . $month . '月的内容';
    }
=======
        return '读取name为' . $name . '的资料';

    }

    public function article($year, $month)
    {
        return '查阅' . $year . '/' . $month . '的文章';

    }

>>>>>>> div
}
